Skip to content

Feature/alarm intent builder#112

Merged
anton-knyazev merged 8 commits intodevelopfrom
feature/alarm_intent_builder
Oct 9, 2020
Merged

Feature/alarm intent builder#112
anton-knyazev merged 8 commits intodevelopfrom
feature/alarm_intent_builder

Conversation

@Just-D-A
Copy link
Copy Markdown

@Just-D-A Just-D-A commented Oct 8, 2020

No description provided.

@anton-knyazev anton-knyazev changed the base branch from master to develop October 9, 2020 09:44
…//github.com/Omega-R/OmegaIntentBuilder into feature/alarm_intent_builder

� Conflicts:
�	.idea/caches/build_file_checksums.ser
�	core/src/main/AndroidManifest.xml
�	core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
�	examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
�	examples/src/main/res/layout/activity_main.xml
�	examples/src/main/res/values/strings.xml
*
* @return This AlarmIntentBuilder for method chaining
*/
fun vibrate(): AlarmIntentBuilder {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fun vibrate(vibrate: boolean = true)

@anton-knyazev anton-knyazev merged commit fc59df1 into develop Oct 9, 2020
@anton-knyazev anton-knyazev deleted the feature/alarm_intent_builder branch October 9, 2020 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants